From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <1410714670.3040.39.camel@decadent.org.uk> Subject: [PATCH 1/5] m25p80,spi-nor: Fix module aliases for m25p80 From: Ben Hutchings To: Brian Norris Date: Sun, 14 Sep 2014 18:11:10 +0100 In-Reply-To: <1410714624.3040.38.camel@decadent.org.uk> References: <1410714624.3040.38.camel@decadent.org.uk> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-oUDbYnKHaBjUVR6/lM0r" Mime-Version: 1.0 Cc: Andrew Lunn , Jason Cooper , linux-spi , MTD Maling List , Ian Campbell , Geert Uytterhoeven , Huang Shijie , linux-arm-kernel@lists.infradead.org, debian-kernel List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , --=-oUDbYnKHaBjUVR6/lM0r Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but its use was also removed at the same time. Now if m25p80 is built as a module it doesn't get the necessary aliases to be loaded automatically. A clean solution to this will involve defining the list of device IDs in spi-nor.h and removing struct spi_device_id from the spi-nor API, but this is quite a large change. As a quick fix suitable for stable, copy the device IDs back into m25p80. Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") Cc: stable # 3.16 Signed-off-by: Ben Hutchings --- drivers/mtd/devices/m25p80.c | 58 +++++++++++++++++++++++++++++++++++++++= ++-- drivers/mtd/spi-nor/spi-nor.c | 5 ++-- include/linux/mtd/spi-nor.h | 3 +-- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index ed7e0a1b..3f0fe86 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -196,6 +196,7 @@ static int m25p_probe(struct spi_device *spi) struct m25p *flash; struct spi_nor *nor; enum read_mode mode =3D SPI_NOR_NORMAL; + const struct spi_device_id *id; int ret; =20 flash =3D devm_kzalloc(&spi->dev, sizeof(*flash), GFP_KERNEL); @@ -223,7 +224,10 @@ static int m25p_probe(struct spi_device *spi) mode =3D SPI_NOR_QUAD; else if (spi->mode & SPI_RX_DUAL) mode =3D SPI_NOR_DUAL; - ret =3D spi_nor_scan(nor, spi_get_device_id(spi), mode); + id =3D spi_nor_match_id(spi_get_device_id(spi)->name); + if (WARN_ON(!id)) + return -ENODEV; + ret =3D spi_nor_scan(nor, id, mode); if (ret) return ret; =20 @@ -245,12 +249,62 @@ static int m25p_remove(struct spi_device *spi) } =20 +/* + * XXX This needs to be kept in sync with spi_nor_ids. We can't share + * it with spi-nor, because if this is built as a module then modpost + * won't be able to read it and add appropriate aliases. + */ +static const struct spi_device_id m25p_ids[] =3D { + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, + {"at26df321"}, {"at45db081d"}, + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, + {"f25l32pa"}, + {"mr25h256"}, {"mr25h10"}, + {"gd25q32"}, {"gd25q64"}, + {"160s33b"}, {"320s33b"}, {"640s33b"}, + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, + {"mx66l1g55g"}, + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, + {"s25fl016k"}, {"s25fl064k"}, + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, + {"sst25wf040"}, + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, + {"m25p128"}, {"n25q032"}, + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, + {"m25px64"}, + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, + { }, +}; +MODULE_DEVICE_TABLE(spi, m25p_ids); + + static struct spi_driver m25p80_driver =3D { .driver =3D { .name =3D "m25p80", .owner =3D THIS_MODULE, }, - .id_table =3D spi_nor_ids, + .id_table =3D m25p_ids, .probe =3D m25p_probe, .remove =3D m25p_remove, =20 diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 03e0ab8..6b1bda2 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -473,7 +473,7 @@ struct flash_info { * more nor chips. This current list focusses on newer chips, which * have been converging on command sets which including JEDEC ID. */ -const struct spi_device_id spi_nor_ids[] =3D { +static const struct spi_device_id spi_nor_ids[] =3D { /* Atmel -- some are (confusingly) marketed as "DataFlash" */ { "at25fs010", INFO(0x1f6601, 0, 32 * 1024, 4, SECT_4K) }, { "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8, SECT_4K) }, @@ -637,7 +637,6 @@ const struct spi_device_id spi_nor_ids[] =3D { { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR= ) }, { }, }; -EXPORT_SYMBOL_GPL(spi_nor_ids); =20 static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor) { @@ -1136,7 +1135,7 @@ int spi_nor_scan(struct spi_nor *nor, const struct sp= i_device_id *id, } EXPORT_SYMBOL_GPL(spi_nor_scan); =20 -const struct spi_device_id *spi_nor_match_id(char *name) +const struct spi_device_id *spi_nor_match_id(const char *name) { const struct spi_device_id *id =3D spi_nor_ids; =20 diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 9e6294f..5ec84cc 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -201,7 +201,6 @@ struct spi_nor { */ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id, enum read_mode mode); -extern const struct spi_device_id spi_nor_ids[]; =20 /** * spi_nor_match_id() - find the spi_device_id by the name @@ -213,6 +212,6 @@ extern const struct spi_device_id spi_nor_ids[]; * Return: returns the right spi_device_id pointer on success, * and returns NULL on failure. */ -const struct spi_device_id *spi_nor_match_id(char *name); +const struct spi_device_id *spi_nor_match_id(const char *name); =20 #endif --=20 Ben Hutchings The world is coming to an end. Please log off. --=-oUDbYnKHaBjUVR6/lM0r Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIVAwUAVBXMLue/yOyVhhEJAQri3w//cvo4hYyIfBBFyC/8sb7H8wVP4Tk31UgU wbmRFNKgVQOnjhWBHfoWIDGhlO684dZdUM8xt/4Dm8BMEVbhDltSshRTIWtrIJwb 1NrxTrH2EiyHUVjMfUhHlspC1S09Vvhnouiti0YnzFmt5s6nroEdPpawripWM/iR /jvCoGQT3G3YW1+V7XpJ/gMvS8ggYk5++mdoV2FoGB7K3fJcOGV362xiqppJTbiF BKhRUhFK8nFkKI6M3UVzuwvVVS9CUWlA7QMliiOiYVuKwTQ9zSbBJYxU1+9aw4vS FlCNwTbNK/KXPqpGj0lqaBUMqBpWphpiuwZmiu0UkwBCL1KLRG3BuzESwMiGJXrn twuQir+kbu03XHxKgwMGhBSk3ZiTGzvE8q1/sycvgxt0/sgD2H4uSfDal3magK/9 FZTx4e6NNoC+ZejDlzMP5TG/kpNqrz6Fi5TqXH59ZcNpbp7xLNejvthsqp8Yi5tf 2ifixC73birp8JDvAD9/HHfDpn01vV3C7uP5b1g67m13XiJFQjhRagUer5xceysZ flmuN4YG/+WTXJ92mMTOoQqhgKwF/24DivMZr1AsBSygitlkqtEPXQFbtLcAgYZ5 +r4OlvIiMBs+TBrIZ9SUXcm+Tkzb5XTkjt4/r4xhZTJevRi80O3J99tCu51WgAxJ W90OiBk7Ep4= =DTVN -----END PGP SIGNATURE----- --=-oUDbYnKHaBjUVR6/lM0r--